Manual cleanup of formatting (mostly comments and print statements)