Remove parsing from the public interface
Refactoring into a tell-don't-ask style