Improved brace placement
Removed accidental optimization