Initial refactor

Cleanup default file processor

Cleanup default file processor