removed extra comments, fixed spacing