Edited the Class headers to be more accurate and similar