Moved stuff to private and fixed getters