Fixed jscs issues