Cleaning

Cleaning up comments and debug code