Refactor some code.
Merge pull request #7 from rideliner/file_settings

Refactor some code.