Improve-5 Simplified LineParser logic