Cleaned up parsing and subingredients