Unify coding style

Please help me to double check