Refactored Files