[#358][WIP] fixes code conventions