Revert "Fix jscs issues"

This reverts commit f21a7c8ee25ef7a02cd79424f5400d94eb746e5c.
Revert "Revert "Fix jscs issues""

This reverts commit ffca0d89ead57b17b59290e317330f7a490fe2d0.
Revert "Revert "Revert "Fix jscs issues"""

This reverts commit ece51336d563ca69de10d366feac2fcd96369cd9.