Fixes from previous commit in terms of formatting.