code cleanup / updates