small refactors for code quality and rules compliance