Refactoring, Output Filename, Cleanup JSON