Little bit more refactoring