Made output strings into constants
Updated class files