Remove Global Variables

Fixes #127