Refactored files