Added @Override annotations and removed unnecessary return statements