Minor code cleanup
Mongo connector extracted from this project to separate module