Clean up after refactoring
Refactored parsing, stumped by my computer's FTP client...