Code style fixes:
* use camelCase
* don't use yoda conditions