Several curly brackets placements fixed