fixup! Changes to improve code and documentation quality.