Module: minor refactoring