* implemented refactorings from ease repository