Fixing some jscs issues