Cleaned up imports, changed readme