Cleaned up comments and debug msgs