Added @Override annotations and removed unused imports