cleaned up shinobi1 code