Minor cleanups

These are minor cleanups that I applied while re-reading the sources of the module