Removed the use of closure