- Rearranging of properties and comma placements for consistancy