Minor code improvements based on reddit feedback

Closes #1