Improved review parser and fixed imports