Tidy code, remove mongo object array creation -> single object creation