PR for code review

Please follow this format for the if-else : 
```
if (condition) {
    ...
} else {
    ...
}
```