Code - cleanup / formatting