Update documentation and cleanup a bit