split parser routines in their own file
remove EOL comments
avoid cancelling label separation