Clean up comments. Closes #22