Reorganized imports and removed @Override lines that Eclipse helpfully
added.