re-factoring

set methods to private that needed to be
get rid of getters that are not needed