cleanup indentation, and imports