slight change in coding style and add flags on VarDeclaration and FunctionDefinition