Formatting and naming

Basically useless changes