Fixes #22: Fixes style issues