Cleaning up property order