refactor: miscellaneous