Rename none/empty to isNone/isEmpty variables

Really small changes, this PR renames the variables: 

- none to isNone 
- empty to isEmpty

It makes the code easier to read.