Remove unnecessary conditionals
It must return null
Whitespace changes.