[#371][finished] code conventions