cleanups with rc parcer util + tests