cleaner properties handling