Cleaning up dollar vars