Cleanup time; create a proper init()