adapted coding style