Formatting + Optimization changes