[MifthDemo] refactoring..