dac: Annotate and superficial readability refactors