Switch to Scanner; Simplified parser