Refactored files in view