Update based on style comments