Formatting / Minor cleanup