More small code clean up changes.