Minor cleanup and documentation