refactor(general) general refactor