Cleanup. Src reformatted.