Style and structural changes, tweaks