Clean up of code.

[ci skip]