Added comments
Added getters