code cleanup and initiated with dummy classes.