Added additional styling and cleaned code