[#59] Small refactorings