Comment changes, removed commented out static member decl.