rearranging deck-chairs, as warmup for refactor