Tech debt reduction

shape