simplified, adjusted style