Move statics into variables