[#356] modifies code conventions