Fix double check emptiness of line for parsing
Fix some error
Optimized code
Optimized code