Make small style improvements