Fixes suggested by reviewer applied.