Fixed formatting and aligned the namings