Cleanup some property ordering