Code clean

Applyng more code cleaning. exit does not need parethesis if no status passed.
committed: ce109925aa11aa31e6b196aa7b931207ff936e5b
so you should rebase to master as well

as you were all doing this on github web, you need to switch commandline to do rebase with squash