Added file retrieval. Cleanup