Some cleanup and hard/easy mode differentiation