better method names

todo: make toplevel parsing line-based