fixed flow store parsing
Code cleanup and doc