Clean code
 - Optimize import