Styling fixes #16