Starts refactoring of wing classes based on pull request feedback.