(Menu) Cleanup of code