* Fixes several coding styles issue