Added a cleaner alternative