Some updating/stylizing