Better flow in parsing and processing sections