Added final declaration to variables