change even more stuff to make coding style better, however, not finished yet