Refactored to remove unwanted instance variables