Trying to refactor things for better format overridability