Style improvment