Improve source-code quality