Refactoring part 1: massive clean