Cleanup and documentation additions