Formatting & comment updates