Cleanup & documentation update