Syntax and cleanup for Mongodb. related to #3