variable names updated and init function removed