Refactoring types

Refactorings per year