s/self/reducer/, indentation cleanup