parser: cleanups
parser: fix padding
parser: add comments