Fixed the missing import
Few minor tweaks