removed tests, inserted comments