Cleaning up Model comments and return values.