Cleanliness yay
Naming standards fixing