Improve code readability by flattening logic tree
Merge pull request #19 from bear24rw/readability

Improve code readability by flattening logic tree
Finished readability changes
Merge pull request #20 from resultsreturned/master

Improve code readability by flattening logic tree