General cleanup; reformatting code w/ WS style.