Cleaned up code and slightly changed layout
Merge pull request #3 from mpickering/master

Cleaned up code and slightly changed layout