(FVE) code formatted & refactored + on-the-fly reconstruct.

Damned ... this was ugly! Thank you, FVE.

Change-Id: I9498100f614522036f0e8d4eeb06ea73aa00778e