added credit where credit was due
cleaning up to prepare for further dev