Optimize imports & typos & docs