Using a cleaner approach
Updates
Cleaning up