Slight refactoring, boilerplates for config