Done some refractoring over the code