Fix attribute ordering, make spacing consistent