Remove extra lines, reorder code to add clarity
Merge pull request #275 from ehashman/master

Test fixes: Remove extra lines, reorder code to add clarity