Updated class name
Moved public variables