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