Modify variable to match our defined breakpoints

Alongside other minor tweaks. Further details in each commit.