Made second round of suggested fixes.