cleanup based on feedback
test parsing