touch up formatting, remove unsed imports