Style cleanup, rebuild, resnap