removed unused imports, redudant semi-colons and redundant return statements