Corrected usage of 'final' for a few variables