thursday 2, more tinkering with the style and cleaning up code