Did one more quick refactor
Did one more quick refactor