Better names and formatting
Oops