Clean up code, don't require base class