Sligh refactoring