Cleanup and documentation update