clean code, small refactor