cleaned up and commented code
added element ids for grader