Coding style fixed
Merge
Yeeeha