code cleanup / comments