Add braces to if-statement
Improved debugging