Generic style improvements