Refractered some of the style and made life easier