Slight cleanup of properties handling