moved variables back into source out of header