[WP] Style fixes

Also switched from pointer constrefs to const pointers
[WP] Merging style fixes