Cleanup source a bit.