Code cleanup

 - Added explicit dependency to commander.
 - vars were missing
 - ';' were missing
 - consistent indentation
 - and some more