Minor indentation etc. changes