diff --git a/erpnext/crm/doctype/appointment/appointment.js b/erpnext/crm/doctype/appointment/appointment.js
index fb78d1a..8888b56 100644
--- a/erpnext/crm/doctype/appointment/appointment.js
+++ b/erpnext/crm/doctype/appointment/appointment.js
@@ -5,12 +5,12 @@
 	refresh: function(frm) {
 		if(frm.doc.lead){
 			frm.add_custom_button(frm.doc.lead,()=>{
-				frappe.set_route("Form","Lead",frm.doc.lead);
+				frappe.set_route("Form", "Lead", frm.doc.lead);
 			});
 		}
 		if(frm.doc.calendar_event){
 			frm.add_custom_button(__(frm.doc.calendar_event),()=>{
-				frappe.set_route("Form","Event",frm.doc.calendar_event);
+				frappe.set_route("Form", "Event", frm.doc.calendar_event);
 			});
 		}
 	}
diff --git a/erpnext/crm/doctype/appointment/appointment.py b/erpnext/crm/doctype/appointment/appointment.py
index 2b9d31d..5d1e301 100644
--- a/erpnext/crm/doctype/appointment/appointment.py
+++ b/erpnext/crm/doctype/appointment/appointment.py
@@ -35,7 +35,7 @@
         self.lead = self.find_lead_by_email()
 
     def after_insert(self):
-        if(self.lead):
+        if self.lead:
             # Create Calendar event
             self.create_calendar_event()
             self.auto_assign()
@@ -63,7 +63,7 @@
         return get_url(verify_route + '?' + get_signed_params(params))
 
     def on_change(self):
-        # Sync Calednar
+        # Sync Calendar
         if not self.calendar_event:
             return
         cal_event = frappe.get_doc('Event', self.calendar_event)
