Merge pull request #1 from dmilstein/master

Small code cleanups