added names to properties csv file and cleaned up code.