Clean up and comments.
Merge branch 'list-comp' of github.com:joneshf/roy into list-comp