re-arrange code

1 - Remove unnecessary brackets and parentheses.
2 - Remove unnecessary return statements
3 - Rearrange code formatting.