Some style improvements