- Did some refactor in the code.