Some style tweeks