Updating the documentation and removing some extra overhead.