fix bug and organize Imports

thx @firstspring1845 !!