Lots of code cleanupShouldn't be any behavioral changes.Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org> (commit: 684b65e)