aesthetical code improvements