A touch of refactoring on parsing api files