change class to module, minor changes