Cleaned up imports to work with Python2.6 and Python 3.3