Finding a cleaner way to clean