Fourth part of simplification refactoring