closes #2
Also cleanup.