additional documentation and cleanup