Fixed some jscs issues