Fixed some structuring