Slight reformat
Formatting, fixing naming