A lot of code refactorings done