SLT-307 Post-code-review beautification