Updated comments removed getters/setters.