little design adjustments
removed unused imports
added surpressWarnings when needed