Cleaned up file management, a little