code cleanup / commenting