simple refactor to clear out excessive logic from go block