Revert "soem styling and string fixes"

This reverts commit 005002add96bde7b7d2d4ddd74e28c37a1cde2e2.
Revert "Revert "soem styling and string fixes""

This reverts commit c406d2c782bcb3ac963b65882f60cd725ea77122.