Updated documentation and removed getter and setter methods