Switch the brackets to be more model-driven.

This allows for better code readability and it will be easier to enhance functionality in the future.