#331 modifying code conventions