Improve comments
Cleanup the .gitignore
Cleanup the code