minor Code cleanup