Code format improvements and extracts an additional builder class from the menu.
Authored by: hagru 2014-12-22
Parent: [r192]
Child: [r194]