Moved static data to static var and moved instance constant data to instance var.
Also removed unused variable.