[MFB] Re-organized the code.
[MFB] Added variable declaration builder (field only)