continued code cleanup