Refactor both files