Refactor parsing a bit