General code cleanup / formatting