'refactored a little'