Refactored in my iMac