Slight refactor, reformat and an configurability