Added style simplification.