Code cleanups.
tree6bab67a7c4caff17dd7fe4f21068d544ebe567d3
drwxr-xr-x - contrib