Simple styling and naming changes which make the whole thing *way* easier to use
Styling improvements