bug fix, organize imports, formatting