MEGA Refactor