Updating making cleaner code