Code cleanup
Code cleanup.