Made class members final where appropriate