Bit more style tweaking