refactoring/code cleaning