diff --git a/src/main/java/org/ballerinalang/plugins/idea/completion/FunctionCompletionInsertHandler.java b/src/main/java/org/ballerinalang/plugins/idea/completion/FunctionCompletionInsertHandler.java
index d1fc027d..c2322ce2 100644
--- a/src/main/java/org/ballerinalang/plugins/idea/completion/FunctionCompletionInsertHandler.java
+++ b/src/main/java/org/ballerinalang/plugins/idea/completion/FunctionCompletionInsertHandler.java
@@ -52,7 +52,7 @@ public void handleInsert(InsertionContext context, LookupElement item) {
         Project project = editor.getProject();
         if (project != null) {
             if (!isCompletionCharAtSpace(editor)) {
-                EditorModificationUtil.insertStringAtCaret(editor, "();",false,1);
+                EditorModificationUtil.insertStringAtCaret(editor, "()",false,1);
                 PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
             } else {
                 editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset() + 1);
diff --git a/src/main/java/org/ballerinalang/plugins/idea/formatter/BallerinaFormattingModelBuilder.java b/src/main/java/org/ballerinalang/plugins/idea/formatter/BallerinaFormattingModelBuilder.java
index d2482d21..f3257442 100644
--- a/src/main/java/org/ballerinalang/plugins/idea/formatter/BallerinaFormattingModelBuilder.java
+++ b/src/main/java/org/ballerinalang/plugins/idea/formatter/BallerinaFormattingModelBuilder.java
@@ -47,6 +47,7 @@ public FormattingModel createModel(PsiElement element, CodeStyleSettings setting
 
     private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
         return new SpacingBuilder(settings, BallerinaLanguage.INSTANCE)
+                .around(OPERATORS).spaceIf(true)
                 .before(ALL).spaceIf(false)
                 .after(ALL).spaceIf(true)
                 .before(ANY).spaceIf(false)
@@ -119,8 +120,7 @@ private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
                 .between(RBRACE, GT).spaceIf(false)
                 .between(RBRACE, XML_LOCAL_NAME).spaceIf(true)
                 .between(XML_LOCAL_NAME, GT).spaceIf(false)
-                .between(NAME_REFERENCE, LBRACE).spaceIf(true)
-                .around(OPERATORS).spaceIf(true);
+                .between(NAME_REFERENCE, LBRACE).spaceIf(true);
     }
 
     @Nullable
diff --git a/src/test/java/BallerinaCompletionTest.java b/src/test/java/BallerinaCompletionTest.java
index f688e037..b7535270 100644
--- a/src/test/java/BallerinaCompletionTest.java
+++ b/src/test/java/BallerinaCompletionTest.java
@@ -464,7 +464,7 @@ public void testFunctionBodyWithFunctionLevelKeywords() {
     public void testInvokingFunctionInDifferentFile1() {
         myFixture.addFileToProject("file.bal", "function test(){}");
         doCheckResult("test.bal", "function main(string[] args){ tes<caret> }",
-                "function main(string[] args){ test(); }", null);
+                "function main(string[] args){ test() }", null);
     }
 
     public void testInvokingFunctionInDifferentFile2() {