Style updates

Closes #48, #50