Added results file and refactored