chore: add missing implicit imports and refactor variables declaration for improved IDE integration See merge request !77