code spacing fixes and property reordering