Added an 's' to COMMENT_MAX_LENGTH for consistency to other constants