I think I refactored?