Cleaning up depracated menu callback, coding styles