indentation changes to get closer to Bruce's code