fix coding style violations and remove reference to region column

part of PT story https://www.pivotaltracker.com/story/show/77974308
tidy up as part of code review