Minor edits per style guide. Rm'd dangling API header.

/to: @chandadharap @sam-github 
Please review when you have a moment.