Fixing parser formatting