Issue 77 code analyzer refactor