Clean up comments and debug strings