Use override and final instead of OVERRIDE and FINAL