Fixed indentation
Fixed imports

Replaced "from X import Y" with "import X"