Updated comments, added TODOs, removed commented out/unused code. Also adding Vim session