Some changes from Shariq, and indentation changes.