Remove trailing whitespace.
Add missing @Override annotation