Fixes for #3 and #5

A few style updates that fixes a few issues that Ben brought up