diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py
index a8cca8faaf..830d74c01e 100644
--- a/lib/ansible/inventory/__init__.py
+++ b/lib/ansible/inventory/__init__.py
@@ -108,7 +108,7 @@ class Inventory(object):
                     inv_file = open(host_list)
                     first_line = inv_file.readlines()[0]
                     inv_file.close()
-                    if first_line.find('#!') == 0:
+                    if first_line.startswith('#!'):
                         shebang_present = True
                 except:
                     pass
diff --git a/library/system/service b/library/system/service
index 97a970a951..141b2ac418 100644
--- a/library/system/service
+++ b/library/system/service
@@ -1008,7 +1008,7 @@ class SunOSService(Service):
         #    enabled   true
         #    enabled   false
         for line in stdout.split("\n"):
-            if line.find("enabled") == 0:
+            if line.startswith("enabled"):
                 if "true" in line:
                     enabled = True
                 if "temporary" in line: