Remove non-const method duplicate
Align consecutive assignments