1. Code cleanup
2. Document code a little bit
