code refactoring / cleaning