further tweaking code guidance