Minimize import, fix comment