Refactor common code

[gdevenyi]

There's reused code in here, break it out into a function header we can import