Code cleanup / make consistent with README
Merge pull request #32 from pmorie/build-images

Code cleanup / make consistent with README