Rearranging the grammar to maybe make it more visually pleasing. Last commit of the night.