Minor fixes and refactor
Minor fixes and refactor

fbaumgardt/arethusa,PonteIneptique/arethusa,Masoumeh/arethusa,Masoumeh/arethusa,latin-language-toolkit/arethusa,fbaumgardt/arethusa,latin-language-toolkit/arethusa,fbaumgardt/arethusa,PonteIneptique/arethusa,alpheios-project/arethusa,alpheios-project/arethusa,alpheios-project/arethusa