Made variables final where they could be