Added back JC's style changes

Somehow got deleted?