cleaned up a lot of stuff, re styling as well as coding practice