Merge pull request #5 from powerist/working

Two tables finished
Cleanup code
Merge pull request #6 from changbl/working

Cleanup code
Style clean-up