Some style enchancements