Spare a couple of lines, add missing import