book keeping, fixing some code format, menu format, removed junk code