Improved style to match requirements