Minor improvements

Mostly style changes. Working with ngrossmann to improve this module.