Fix indentation etc from previous commit