some styling and optimations