code cleanup / niceties