Added interface name to strategies and cleaned up formatting of generated classes.