Minor formatting/commenting changes