remove unused constants, remove hidden const (not needed)
remove quit and beer menu item
Reformat code from tab to 4 spaces, following Android Style, http://source.android.com/source/code-style.html