Some renaming
Spacing and naming