Update to use the _ in front of class variables