Further condensed code to enable fast editing
Merge pull request #7 from lisanmorrison/master

Further condensed code to enable fast editing