Refactored mycat