Added changes regarding style gidelines