improved styling and resolved unused imports