cleaned menu code