Moved comment checking into seperate classes