Remove duplicated code again (again) of Top