Whitespace and code style changes I missed the first time around.
Use ATV prefix instead of NT.
Merge pull request #3 from jcoleman/style-cleanup-round-2

Style cleanup round 2