Cleaned up formatting - beginning more MSWITCH