Refactoring module
Small adjustments