Update mcf checks for separate barriers and lights
Update indentation
Remove obvious comments