minor changes / readibility