Added newline and commented out unused model fields