Improved code style (like missing @Override annotations, etc.)