Fix indentation etc.