Code cleanup around checking a for 'not nil'
Merge pull request #27 from LowAmmo/code-cleanup

Code cleanup around checking a for 'not nil'