Got rid of useless braces
Optimized for speed a bit