code cleanup (@Override adding, removing unused imports etc)