Refactoring. NB: This is NEW candidate to format translator