consolidated moving and moving! and DRYed mvg
minor formatting