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