formatting and comment updates