LPS-45272

Hey Brian,

Finished with the changes and also found some other places that required some aligning (last commit).

Thanks,
Levente