Export: Indentation, little refactoring