Mongo readability improvements and streamlining
Merge pull request #98 from noa--/mongo_readability

Mongo: Restructure conditionals to improve readability, and minor changes