Use a cleaner approach