Merge branch 'rs/code-cleaning'