refactor Me module