cleaned up parsing logic
changed token types from comment/non-comment bool, text to comment, code, string