* refactorings (continued.)