Some methods to private
Some methods to private. Resolved conflicts