Wrapped in a class; cleaned up code.