Added separate parseLine and parseToken methods.