Merge pull request #206 from pisaychuk/master

CleanUp and formatting
serviceRestartCmd removed, code formatting
code formatting
code clean-up
code clean-up
code clean-up
code formatting
code formatting
code formatting, clean-up
code formatting, clean-up