cleaned up indentation and tags