more comments / general cleanup