start code cleanup / structural changes