Cleaned up closing tags and EOFs