Made template more readable. REOL-12