Styling up. Closes #16