refactor ms_utils

module names more descriptive