Little bit refactored code.