Refractored a bit