Fixed syntax errors. REOL-21
Use more readable syntax where applicable. REOL-21