Code style update
Added automatic code rewriting into correct style