Refactorings. Added @Overrides.