Got rid of an unnecessary method, and exposed a property to public