cleaner code
cleaner code