Feature/main menu structure

Avoid comma after the last parameter of a method call.