Little bit refactored.