Refactoring, small changes