Optimize import and align the documentation