Styling fixes #6, fixes #5