Seal private/internal types and make methods static when applicable

Seal private/internal types and make methods static when applicable #788