Small Changes to structure