Re-ordered the public/protected sections to keep the public section all together