Removed classes and converted methods to module-level functions