minor cleanup and documentation