Refactoring and code reorganizing