I cried, so I refactored