module cover refactor