Clean up vars
Merge pull request #1 from tobiasahlin/clean-up-vars

Clean up vars