+ minor tweaks
+ removed import