More final variables and @Override annotations.