Refactoring: added @Override where appropriate