Cleanup comments and validation strings