Implemented some of Paul's comments.