Cleanup of code.

Read readme.md - explains it all.