Few minor comment / formatting updates