first stab at cleanup