code cleanup fit and finish
Merge pull request #4 from matttabor/persist_menu

code cleanup fit and finish