Moved hard-code file path to config
Clean up & comments