Refractored and did things