Suggested changes from scrutinizer