Remove unnecessary conditionals
It must return null
Whitespace changes.
Merge pull request #1 from ramsey/master

pull