Clean up some code to make it more clear.
Add brakcets to clarify code.