Fix line length
Refactor to helper method on gh