Some quick refactors about list loading and some other details, less is more