Fix some styling and fix #52