Make style changes

Tests still all pass