Formatting tweaks + improve comments