Improved refactorings

More improvements on the refactoring side of life.