Small code cleanup and documentation fix