ensure that allocated memory is freed
oop
menu code improvals (oop)