Fixed legacy code errors
Added final statement
Added final statement  #2