Refactoring, removed unnecessary modifications