Clean up code comments and do less format conversion