Some changes for the greater good

maybe `parseLine` is a better name?