Code prettifying
Barriers added