Whitespace cleanup of models