Optimize, re-organize imports