Improve wording and remove unused code

Closes #77