Updated file opener logic. Small clean up.