fomatting and remove unnecessary imports