graphics cleanup / rename