Adjusting comment and ROOT path
Refactoring parsing into a private method
Extracting else out of if clause