[Issue #179] [WIP] modifies code to match code conventions