Address style issues, Comment fix better

Authored by amccann.