Type and styles cleanup