Satisfied Checkstyle with comments and minor changes in code.
TODO: Test the stuff with new powador firmware installed on the host a few days ago