Applicative functors, some style tweaks