Coding style conformation and reorganize a little bit.