Straighten out Flow concept and clean up.