Added comments, removed tests