commit cd445f3c9b6aa079a969351d6eb742b8a4d24f6b
some cleanup