switch code syntax to Dana's more modern style