Accepted some of Scrutinzer's suggested changes