Minimized trivial changes for pull-request