Increase code quality