removed closing tags and some cleanup