Added style checking