Revert "Revert "Revert "Revert "Fix jscs issues""""

This reverts commit 1ee784eb3448e75163c51c3350b214b378a1ebc4.
Correct  jscs errors

Correct jscs errors