removed unused variable
changed headings
removed useless attributes