@jalabort note that these are only minor style changes from what you wrote in #330. Happy to merge was Travis has run?