code conventions for WEB-9052 +review WEBCR-285