Few tweaks after properly reading the mongoose docs