Cleanup

Cleaned up comments and some variable declarations. Removed some debug
and commented / unused code.