A number of fixes and cleanup

Cool, I was not aware of this one. Might use the `=>` syntax here.