Added romanization field and cleaned up some code