Push position claiming; minor style fixes