Avoid using @@class variables

They are more global than needed

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>