uppercasing properties + cleanup