Replace check Option with isdefined and isEmpty in Scala code

Propose to replace the Scala check for Option != None with Option.isDefined and === None with Option.isEmpty.

I think this, using method call if possible then operator function plus argument, will make the Scala code easier to read and understand.

Pass compile and tests.