** Code cleanup