Source formatting, clean up.