Improve ordering of properties