- refactorings and improvements