Tidied upon csv parsing so it will not explode on endline parsing