Little bit refactoring