Small optimization and updated docs