Fixed more Scala style issues.