Fixed some imports and changed the indentations