Some formatting updates (ran the code through indent)