cleanup commit before looking at Pull Request #15 -- minor changes?