Made CSV parser into separate class