Tidy up. Comments. Closes #1