Make instance variables private
Make naming changes