Hart code cleanup and add is_two_tier