Adds cleaner compilation with VariableDeclarations