Minor refactor to enhance readability, foldability, verbosity, etc.