Some formatting updates and a small refactoring update.