combining changes
improving the style