Refactoring - code cleaning