refactor: some cleanup before revised implementation

refactor: some cleanup before revised implementation #26