Added final to applicable variables