Cleaned up Mode handling some more