Revert "format code, organize imports"

This reverts commit a5ff1efff3ee90937c128824ef4bd00a69801061.