Corrected methods to improve Encapsulation