Clean up formatting
Big update
Seriously, conform to the naming scheme