Code cleanup; preparation for Japanese Battle e