Little Code cleanup.