simplified and fixed missing style