upgrading code
changed the style a lot -- looks better