Clean up part deux

Pm sent on brackets.