Moved variable declarations to .h