cleaning up code, reducing technical debt