Simplify Factories modules. Replace comment with better class name.