Mostly style and comment updates