Removed unwanted final from variables