spencerpease Refactor formatting