Updated format, removed extra comments, updated references