[#181][WIP] updated code conventions