+1 on chris' changes, felt a little run-on before