Adding comments and removing unneeded icon code
Massive cleanup and commenting
Massive cleanup and commenting