Refactor

Extended By Error Mike Stamper , Dani Villamil 1511452800000