Fixed formatting and indentation, removed unused imports