make member private
remove TODOs added as github issues