Little bit refactored