Refactored MORE of the things