Reordered methods so they public/internal/private