Refactored that one thing