minor arrangement changes