95f0d02d79
- Updated formatting - Reordered methods - Removed a method These changes will hopefully simplify future contribution. Issue gh-6019