Small fixes2

This is the follow-up of #116 which was originally proposed in #92. Just tiny style fixes.