Code review fixes

Addresses white space issue, naming convention consistency, and reverts changes to vendor code.