cleaned up the code This is really just redoing commit e72e54e11c after I had to merge so I could submit a pull request that actually works. Signed-off-by: Scott Gustafson <scott@garlicsoftware.com>
e72e54e11c