Rewriting (if-not (nil? x) ...) with more idiomatic (if x ...)
Merge pull request #2 from DNNX/master

Refactored code a little