Tided up some property sheets