refactor, move parse code to aqi source