removed redundant else statement
replace tabs with spaces
Merge pull request #370 from lsmith77/code_tweaks

Code tweaks