Ex1 refactored
Ex2 refactores
Ex2 refactored