Some code reformat

I appear i still worked on my own fork. Last commit.