More clean , and organized code