Initial stab at cleanup