Some minor refractoring