Cleaning up various style issues

Closes #43