Remove debug stuff / small code cleanup / renamings