Tweak style
Manual merge. Closes #15