aesthetical code improvements
aesthetical code improvements