cleanup: reorder members
cleanup: reorganize imports
cleanup: remove unused code