* Remove unused variable
* Be less criminal about storing extra text