[Issue 188] [WIP] modifies code to match code conventions