Suggested changes (code style, code improvement)