Some more style tweaking