cleanup and update documentation