removed unnecessary return statements & assignments and improved negative condition
Merge pull request #360 from bsnape/fix-unnecessary-return-statements

removed unnecessary return statements & assignments and improved negativ...