More code cleanup and editorconfig tweaksSigned-off-by: Lamont Granquist <lamont@scriptkiddie.org> (commit: 2570ac4)