Code formatting

Coding style needs some unification.