Second attempt at cleaning up source.