Refactored .parse