Cleaned up importing, could in theory work on python3