Style fixes: remove unnecessary braces for one-statement if blocks, no else after return, etc. No funcionality change.