cleaned up the case statement a little moar