moved some lines around, deleted a space