Variables moved to setup file, closes #23