Code cleanup, replace liftM with applicative <$>.