Added attribute labels, fixed indentation, Improve header