Add TOKEN_END, use int for boolean types, method definition braces on newlines, style