Cleanup formatting lost during merge of controller changes