Style improvments