code cleanup per idea inspections