tried to improve the style