updated comments, removed commented out code.