And think this should also be replaced with classes, methods, properties, constants, ect.?