refactor fishbase parser