Updated documentation and cleanup