This is a cleaner method