Refactoring, small fix