Fixed scala style as per review