ran through analyzer and made some suggested changes