Moved the vars into the actual methods