Make the whole parser more clear and consistent