Changes in many a file, refactor