[Issue #205][WIP] Fixed more code conventions