Refactoring bollocks
And refactored back