Of course, systematic refactoring would be the best :+1: