Modularise class methods and use a better class name.