clean up
comments - first steps