Code clean up updates.