Last indentation changes and corrections