Fixed jscs issues, enbaled it into build