Did some refractoring