Trim trailling whitespace
Add missing @Override annotations