Add missing import plus a little formatting