code conventions for WEB-8917 +review WEBCR-212