Refactor complex methods to make CI green

Merged username-removed-444 requested to merge fix-flog into master