cleanup parser a lot, add comma sep and initializing var decs