cleaned coding style