SLT-307 Post-code-review cleanup, formatting and try-catches