diff --git a/pyfanctl/fan_control.py b/pyfanctl/fan_control.py
index e1eac7d..85163e8 100644
--- a/pyfanctl/fan_control.py
+++ b/pyfanctl/fan_control.py
@@ -1,7 +1,5 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 
-import sys
-#from gi.repository import GObject
 import gobject
 import dbus
 import dbus.service
@@ -14,48 +12,46 @@
 
 FAN_BUS = 'org.openbmc.Sensors'
 FAN_OBJS = [
-	'/org/openbmc/sensors/speed/fan0',
-	'/org/openbmc/sensors/speed/fan1',
-	'/org/openbmc/sensors/speed/fan2',
-	'/org/openbmc/sensors/speed/fan3',
-	'/org/openbmc/sensors/speed/fan4',
-	'/org/openbmc/sensors/speed/fan5',
+    '/org/openbmc/sensors/speed/fan0',
+    '/org/openbmc/sensors/speed/fan1',
+    '/org/openbmc/sensors/speed/fan2',
+    '/org/openbmc/sensors/speed/fan3',
+    '/org/openbmc/sensors/speed/fan4',
+    '/org/openbmc/sensors/speed/fan5',
 ]
 FAN_IFACE = 'org.openbmc.SensorValue'
 
-class FanControl(DbusProperties,DbusObjectManager):
-	def __init__(self,bus,name):
-		DbusProperties.__init__(self)
-		DbusObjectManager.__init__(self)
-		dbus.service.Object.__init__(self,bus,name)
-		self.Set(IFACE_NAME,"floor",250)
-		self.Set(IFACE_NAME,"ceiling",255)
-		self.fan_intf = []
-		## create interface proxies to all fans
-		for fan in FAN_OBJS:
-			print "Initializing fan: "+fan
-			obj = bus.get_object(FAN_BUS,fan,introspect=False)
-			self.fan_intf.append(dbus.Interface(obj,FAN_IFACE))
-			
-	@dbus.service.method(DBUS_NAME,
-		in_signature='', out_signature='')
-	def setMax(self):
-		print "Setting fans to max"
-		for intf in self.fan_intf:
-			intf.setValue(dbus.UInt32(255))
-		
+
+class FanControl(DbusProperties, DbusObjectManager):
+    def __init__(self, bus, name):
+        DbusProperties.__init__(self)
+        DbusObjectManager.__init__(self)
+        dbus.service.Object.__init__(self, bus, name)
+        self.Set(IFACE_NAME, "floor", 250)
+        self.Set(IFACE_NAME, "ceiling", 255)
+        self.fan_intf = []
+        ## create interface proxies to all fans
+        for fan in FAN_OBJS:
+            print "Initializing fan: "+fan
+            obj = bus.get_object(FAN_BUS, fan, introspect=False)
+            self.fan_intf.append(dbus.Interface(obj, FAN_IFACE))
+
+    @dbus.service.method(DBUS_NAME, in_signature='', out_signature='')
+    def setMax(self):
+        print "Setting fans to max"
+        for intf in self.fan_intf:
+            intf.setValue(dbus.UInt32(255))
+
 
 if __name__ == '__main__':
-	
-	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-	bus = get_dbus()
-	fan_control = FanControl(bus,OBJ_PATH)
-	mainloop = gobject.MainLoop()
-   
-	print "Starting fan control"
-	fan_control.setMax()
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+    bus = get_dbus()
+    fan_control = FanControl(bus, OBJ_PATH)
+    mainloop = gobject.MainLoop()
 
-	fan_control.unmask_signals()
-	name = dbus.service.BusName(DBUS_NAME,bus)
-	mainloop.run()
+    print "Starting fan control"
+    fan_control.setMax()
 
+    fan_control.unmask_signals()
+    name = dbus.service.BusName(DBUS_NAME, bus)
+    mainloop.run()