Added final modifier to several fields