Merge branch 'style-polishing' into 'master'

Style polishing

Closes #56, #48, and #24

See merge request !44
2 jobs for master in 1 minute and 17 seconds