Some formatting and comment updates