A lot of refactoring on code.