Refactoring, modifications