[codestyle] Code cleanup