Cleanup

HTML cleanup
Use constant instead of variable
TOS design
cleanup
resolve conflict
resolve conflict
Merge pull request #18 from foxbot/master

Cleanup